Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:49:31 +0000 (14:49 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:49:31 +0000 (14:49 -0400)
commitbc90136d81db5178a86c84d70c31aa16f47db995
treeb1512a10f215797f4e08d52956adf60a42338cbe
parent7e5028e69afae62ded8173f4a47732fd242273de
parent53012a991a4984ec3480e937bc0545052e68f98c
Merge changes from emacs-23 branch
configure.in
doc/lispref/ChangeLog
doc/lispref/keymaps.texi
doc/lispref/nonascii.texi
doc/lispref/strings.texi
lisp/ChangeLog
lisp/avoid.el
lisp/info.el
lisp/vc/emerge.el
src/ChangeLog
src/xfaces.c